From 18f03170305e3b36eb997276e69993cc3113c9a5 Mon Sep 17 00:00:00 2001
From: Eli Zaretskii <eliz@gnu.org>
Date: Sun, 7 Jan 2001 09:56:59 +0000
Subject: [PATCH] *** empty log message ***

---
 lisp/ChangeLog | 1 -
 1 file changed, 1 deletion(-)

diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5774a764048..485e9a4db83 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -1386,7 +1386,6 @@
 	`verbatim' so that we don't inadvertently delete a non-existant
 	directory name.
 
->>>>>>> 1.1768
 2000-11-27  Kenichi Handa  <handa@etl.go.jp>
 
 	* international/characters.el: Specify cases and syntaxes for
-- 
2.30.2